Install gdk-pixbuf-xlib-3.0.so.0, although this might be nuked in the near future

diff --git a/contrib/gdk-pixbuf-xlib/Makefile.am b/contrib/gdk-pixbuf-xlib/Makefile.am
index 4b89e5172d85e2a28c041c87d2f362e248aea31c..9ddcefa7df3087494833d198306870e6b3899a77 100644 (file)
--- a/contrib/gdk-pixbuf-xlib/Makefile.am
+++ b/contrib/gdk-pixbuf-xlib/Makefile.am
@@ -4,7 +4,7 @@ if PLATFORM_WIN32
 no_undefined = -no-undefined
 endif
 
-lib_LTLIBRARIES=libgdk_pixbuf_xlib-2.0.la
+lib_LTLIBRARIES=libgdk_pixbuf_xlib-3.0.la
 
 INCLUDES = \
        -I$(top_srcdir) -I$(top_builddir)       \
@@ -12,31 +12,31 @@ INCLUDES = \
        -I$(top_srcdir)/contrib                 \
        $(GDK_PIXBUF_XLIB_DEP_CFLAGS)
 
-libgdk_pixbuf_xlib_2_0_la_LDFLAGS =         \
+libgdk_pixbuf_xlib_3_0_la_LDFLAGS =         \
        -export-dynamic                                         \
        $(no_undefined)                                         \
        -version-info $(LT_VERSION_INFO)
 
-libgdk_pixbuf_xlib_2_0_la_LIBADD = \
+libgdk_pixbuf_xlib_3_0_la_LIBADD = \
         $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
        $(GDK_PIXBUF_XLIB_DEP_LIBS)
 
-libgdk_pixbuf_xlib_2_0_la_SOURCES =         \
+libgdk_pixbuf_xlib_3_0_la_SOURCES =         \
        gdk-pixbuf-xlib-private.h       \
         gdk-pixbuf-xlib.c               \
         gdk-pixbuf-xlib-render.c        \
         gdk-pixbuf-xlib-drawable.c      \
         gdk-pixbuf-xlibrgb.c
 
-libgdk_pixbuf_xlibincludedir=$(includedir)/gtk-2.0/gdk-pixbuf-xlib
+libgdk_pixbuf_xlibincludedir=$(includedir)/gtk-3.0/gdk-pixbuf-xlib
 
 libgdk_pixbuf_xlibinclude_HEADERS =                    \
         gdk-pixbuf-xlib.h                              \
         gdk-pixbuf-xlibrgb.h
 
 pkgconfigdir   = $(libdir)/pkgconfig
-pkgconfig_DATA = gdk-pixbuf-xlib-2.0.pc
+pkgconfig_DATA = gdk-pixbuf-xlib-3.0.pc
 
-EXTRA_DIST += gdk-pixbuf-xlib-2.0.pc.in
+EXTRA_DIST += gdk-pixbuf-xlib-3.0.pc.in
 
 -include $(top_srcdir)/git.mk

diff --git a/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc.in b/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc.in
deleted file mode 100644 (file)
index 5c7871d..0000000
--- a/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: GdkPixbuf Xlib
-Description: GdkPixbuf rendering for Xlib
-Version: @VERSION@
-Requires: gobject-2.0,gmodule-no-export-2.0,gdk-pixbuf-2.0
-Libs: -L${libdir} -lgdk_pixbuf_xlib-@GTK_API_VERSION@
-Cflags: -I${includedir}

diff --git a/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-3.0.pc.in b/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-3.0.pc.in
new file mode 100644 (file)
index 0000000..b55d856
--- /dev/null
+++ b/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-3.0.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: GdkPixbuf Xlib
+Description: GdkPixbuf rendering for Xlib
+Version: @VERSION@
+Requires: gobject-2.0,gmodule-no-export-2.0,gdk-pixbuf-3.0
+Libs: -L${libdir} -lgdk_pixbuf_xlib-@GTK_API_VERSION@
+Cflags: -I${includedir}